From 464df4007b21010249767f73b3046d3ca5c9720c Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Tue, 5 Sep 2017 00:48:06 +0100 Subject: [PATCH] themes: Use $selected_fg_color for :hovered emoji This is much needed for HighContrast as otherwise emoji are invisible (or nearly in Inverse). It also syncs up with hovered menu items, etc. https://bugzilla.gnome.org/show_bug.cgi?id=787279 --- gtk/theme/Adwaita/_common.scss | 1 + gtk/theme/Adwaita/gtk-contained-dark.css | 2 +- gtk/theme/Adwaita/gtk-contained.css | 2 +- gtk/theme/HighContrast/_common.scss | 1 + gtk/theme/HighContrast/gtk-contained-inverse.css | 2 +- gtk/theme/HighContrast/gtk-contained.css | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index bbe63c2bf9..676e951d98 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -4468,5 +4468,6 @@ button.emoji-section { :hover { background: $selected_bg_color; + color: $selected_fg_color; } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 77dc6fad75..eb266d9c62 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1916,7 +1916,7 @@ button.emoji-section:checked label { opacity: 1; } .emoji { font-size: x-large; padding: 6px; border-radius: 6px; } -.emoji :hover { background: #215d9c; } +.emoji :hover { background: #215d9c; color: #ffffff; } /* GTK NAMED COLORS ---------------- use responsibly! */ /* diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 653e931f05..6791c1aaf4 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1936,7 +1936,7 @@ button.emoji-section:checked label { opacity: 1; } .emoji { font-size: x-large; padding: 6px; border-radius: 6px; } -.emoji :hover { background: #4a90d9; } +.emoji :hover { background: #4a90d9; color: #ffffff; } /* GTK NAMED COLORS ---------------- use responsibly! */ /* diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index 70f9f44381..de3d0fb013 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -3459,5 +3459,6 @@ button.emoji-section:backdrop { /* Dodge stuff inherited from backdrop button */ :hover { background: $selected_bg_color; + color: $selected_fg_color; } } diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css index ab66c8add6..3751903102 100644 --- a/gtk/theme/HighContrast/gtk-contained-inverse.css +++ b/gtk/theme/HighContrast/gtk-contained-inverse.css @@ -1598,4 +1598,4 @@ button.emoji-section:checked label, button.emoji-section:backdrop:checked label .emoji { font-size: x-large; padding: 6px; border-radius: 6px; } -.emoji :hover { background: #ddd; } +.emoji :hover { background: #ddd; color: #000; } diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css index e0e583f36d..1d982b2721 100644 --- a/gtk/theme/HighContrast/gtk-contained.css +++ b/gtk/theme/HighContrast/gtk-contained.css @@ -1604,4 +1604,4 @@ button.emoji-section:checked label, button.emoji-section:backdrop:checked label .emoji { font-size: x-large; padding: 6px; border-radius: 6px; } -.emoji :hover { background: #000; } +.emoji :hover { background: #000; color: #fff; } -- 2.30.2